applied patch from Tim Mooney fixing bug #392843, replacing _FUNCTION_

* babl/babl-internal.h: applied patch from Tim Mooney fixing bug
#392843, replacing _FUNCTION_ with _func_ which is the C99 equivalent
of the gcc extension.

svn path=/trunk/; revision=197

diff --git a/ChangeLog b/ChangeLog
index 1bc731c00083877bef9e68112f4d27a11123040b..a6701e77f02e7281d76383134d31d38c8b4bd0ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-22  Øyvind Kolås  <pippin@gimp.org>
+
+       * babl/babl-internal.h: applied patch from Tim Mooney fixing bug
+       #392843, replacing _FUNCTION_ with _func_ which is the C99 equivalent
+       of the gcc extension.
+
 2007-01-16  Michael Schumacher  <schumaml@cvs.gnome.org>
 
        * configure.ac: remove the check for dlopen again - didn't work as

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 12fe70c457815cebb237580b2e3183fd320b8b7b..48537e23430a5cbdc9d4c9b0a0cffa55f0b853ea 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -147,10 +147,10 @@ real_babl_log (const char *file,
 }
 
 #define babl_log(args...)                               \
-  real_babl_log(__FILE__, __LINE__, __FUNCTION__, args)
+  real_babl_log(__FILE__, __LINE__, __func__, args)
 
 #define babl_fatal(args...) do{                         \
-  real_babl_log(__FILE__, __LINE__, __FUNCTION__, args);\
+  real_babl_log(__FILE__, __LINE__, __func__, args);\
   babl_die();}                                          \
 while(0)
 
@@ -194,7 +194,7 @@ babl_##type_name##_id (int id)                                \
   babl = babl_db_exist (db, id, NULL);                        \
   if (!babl)                                                  \
     {                                                         \
-      babl_fatal ("%s(%i): not found", __FUNCTION__, id);       \
+      babl_fatal ("%s(%i): not found", __func__, id);       \
     }                                                         \
   return babl;                                                \
 }
@@ -207,13 +207,13 @@ babl_##type_name (const char *name)                             \
                                                                 \
   if (babl_hmpf_on_name_lookups)                                \
     {                                                           \
-      babl_log ("%s(\"%s\"): hmpf!", __FUNCTION__, name);       \
+      babl_log ("%s(\"%s\"): hmpf!", __func__, name);       \
     }                                                           \
   babl = babl_db_exist (db, 0, name);                           \
                                                                 \
   if (!babl)                                                    \
     {                                                           \
-      babl_fatal ("%s(\"%s\"): not found", __FUNCTION__, name); \
+      babl_fatal ("%s(\"%s\"): not found", __func__, name); \
     }                                                           \
   return babl;                                                  \
 }